auto upstream
authorJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 14:51:22 +0000 (15:51 +0100)
committerJoakim Verona <joakim@verona.se>
Thu, 27 Dec 2012 14:51:22 +0000 (15:51 +0100)

Trivial merge